refactoring
renaming
possibly good filter to find all leaves
changing out filter strategy to be a bit more stable and less bug prone