Whitespace and naming change.  Removed redundant guard code.