Refactorize buffer
Refacterizing Player...