Streamlining a few things.