Coding style and variable name cleanup