zero-change cosmetic cleanup of code.  make exit points explicit, and use curly braces consistently.