Refactor hours and days indicators