Comment and indent fixes