refactoring, proper handler status