block refactoring, removed parenting