couple refactoring