inf-1026 more refactoring work