Cleaned up buffer usage