Web steps refactoring