Made deck buffer an instance member to limit allocations
various refactorings