This fixes an issue where state bleed from the parent to the child

I think these methods was easier to understand if we group them together. 

@bcamper what do you think?