shark refactor for devshop