Enhance && cleanup fields
Enhance && cleanup fields /2