stoper refactor