refactors formatter, removes indirections, adds sample integration tests