Improve formatting of hour display, tests passing