Better structure and refactoring.