Formatting OCD

Please refer to CONTRIBUTING.md