clean up local variables code
merge insignificant whitespace differences