Further streamlining and tweaks