Refactored hours and minutes to wrapper functions