Added constant for base buff size
Refactoring