Still cleaning up from the bad branch.  Fixed indentation too.