Tidy up Buffer construction