Comment and indent cleanup