cleaned up comments and such