A few formatting changes

Cleaned up a few thing while reviewing the bundle for inclusion. Kept missing you on IRC yesterday. Have a couple scoping questions about the grammar if you can poke me tomorrow on IRC.