clean up comments and variable names