hours style cleanup
Merge branch 'feature/hours-cleanup'