some style corrections
retabbed and indented