A little bit of streamlining

Streamlining is harder than it looks