more refactoring action