clean up comments, names, warnings