further market service refactoring