Minor style changes all around