Cleanup TimeUtil, add javadocs