Minor style improvements