Standardise formatting

Please run `make format` before pushing all future code.