Make local variable usage consistent throughout