Refactoring after weekend marathon