BufferService minor refactoring