Corrected a few code quality issues.