Improved code and quality