Edited hour generating method, code readability changes