Refactoring statement feature