Did some refactoring to procrastinate from writing test cases