Minor style changes...