Minor style changes pt.1