Cleaned up buffer.hpp