Cleaned up Buff object