comments and a bit all-around style fix