basic clean up comments