Some style formatting improvements.