Use DAYS_PER_WEEK constant and remove floor in weekOfMonth