Clean up and refactoring of TimeIntervalCollection