indentation changes; minor cleanup --KW