Minor style tweeks