Cleaned up time util