Cleaned up in commenting issues.