put refactoring (based on references/feature)