Style specs

Here are the tests I spoke to you about.  I'm not going to do any other fixes yet because I want you to make some of the other changes I commented on in your pull request first.