Tidy up parent-child relationship implementation