Improve day management logic