Just helping out a bit..

Style *and* content changes. Next time, I'll remember to keep them in separate branches!