Cleaning up, simplifying, refactoring, documenting