proposed simplification using orphan instances
small cleanup