Minor clean up
Shorten the code in preparation for the merging with childfirst