Cleaning some things up, streamlining and optimizing some rings