Refactoring, simplifying, commenting.