Refactored some code, deleted some methods and test to make it look more streamlined