booking data refactoring