Minor style changes etc.