Normalize formatting and spacing

I realized there were some cases of mixed tabs and spaces.  This commit
should normalize all formatting.