Refactored - Move mouse handling to own class #117