Streamlining the code continues.