Cleaned up a bit and added command line hour parsing