refactor, fix error in building first month