Fix build

- Scalariform also reformatted some of the code