Cleaned up StreamBuffer & integrated it along-side packets