Minor style changes to improve flow