target refactoring