clean up comments and variable use