destination to target refactor