Refactoring to dedupe fields