Just a few cleanup/style improvements.