Refactored some mouse events
Cleanup