Fixed code-inspection issues.