Refactored some more classes