cleaned up the Unbuffer implementation