Some style improvements.