Some style polishing

A few small tweaks to top off Mouq++'s heroic redesign work