More modular code.