brief refactoring