Class diagram cleaned up.