Some cleanup streamlining