Optimization and code simplification.