Improved code quality marginally.