Minor style fixes
merges tues