Refactored mouse targetting