Refactor code to avoid collisions removing TimeOfDay and Shift from global namespace