Fix style + commenting issues.