adding scalariform to format code
improved code style
cleaning up unrelated files