Refactored some of the default classes
Made some minor changes.