Better Conventions!

Here are a few changes that I would make to your conventions. Mainly issues with spacing and superfluous conventions.