Cleaned up Stream Implementation