More modular code
More modularization
All the inflation tests