Simplification and modularization