Small refactor.
Add clean field method