Improved naming and code organization