Cleaning up code and refactoring.