Clean up comments and variable names