Fixed code quality issues.