A few style improvements.