Slight cleanup of diagram