Reverting to original prettyprint & visitor files