start refactoring of handlers