Follow-up to #53 Includes doing the actual coding standards changes.
Follow-up to #53
Includes doing the actual coding standards changes.