refactoring Handler