Leisure time refactoring, day 1