management: code refactoring