Streamlining code

Part 6