Cleaned up comments and naming