Some cleanup & streamlining