Several cleanups and modifications. Extract cached formatter.