Ref #14 - InputManager code cleanup