Fixing code quality issues.