Optimization, refactoring.