Refactored a lot of the class