Added support for time in 1h2m3s format, cleanup