clean up comments and stuff