Refactoring of shifter-web