refactoring classes

e.g. combined day plus class into day