Resolve code standards

Now that tests are being run, code standards errors are properly reported including a patch for most of them.
First we'll resolve them, and then all issues must meet code standards before being merged.