[CON-19] some more refactoring on chronologizing