Clean up code smells, start streams
Clean up code smells, start streams