Cleaned up comments and stuff