Refactor of parent object references and minor cleanup