Some more cleanup and description for the class