cleanup modularization