Formatting of -h flag
Clean up time control