refactoring

removed unnecessary method from Token

removed inline if statements from TimelineConcatenator

extracted methods from TimelineConcatenator