Cleaned up comments and uses