Cleaning up  buffers.cpp for #17