Cleanup a few classes and change name/comments of a few methods