scalariform cleanups!!