Tweak coding standards

First run at coding standards