Just some general clean up and refactoring.