comment fixes, indentation and general cosmetic cleanup