cleaned up buffers and object representation