Some style refinements