Minor style changes (?)