Applied formatting suggestions from scalariform