Ryan's styling updates

I'll probably have some more minor refinements, but this is getting pretty close.
Another whitepsace change. :(