Fixed a few comment and code quality issues.