Improvements for code quality