Fixed code quality issues.
Merge.