Improved code quality and exception handling.