Minor style improvements.