buffer: stylistic cleanup