Month class refactoring

Refactoring of duplicated code