b43cf8188eeb880c52bc7e969ff2bc0379634892  modularize