Adding refactoring to formREST