Comments and indentation cleanup