Clean up time formatting

Clean up time formatting to be more user friendly. It now includes the text "hours" and "minutes".