[NOP] more modularization