added scalariform and reformatted source