comments and variable name cleanup