More Timinalignment refactoring
More refactoring