More cleanup and streamlining