Refactoring day cycle