Minor style refinments