Cleaned up time_builder()

Dropped file size in half