Did some refactoring to clean up some code