Refactoring and modularization.