optimize
withFreshErrorBufferFeedBack
remove mutators
reorder defs