Refactoring, cleaning up, learning