Removed old stream_generator.cpp, fixed some indentations