Refactor crumble methods