small cleanup and simplification of buffer in spec