felder refactoring