Simplify InputHandler logic