Minor style tweaks and tabs