Cleaned up InputManager