BUFFER_SIZE was unused
Refactoring: using const for terms