Refactoring (mainly names) for CInputHandler