Refactored some classes for style consistency.