small refactoring of shoots