[cleanup] Refactored code for better readability, performance, and better granularity of field activation