Clean code
Add Mouse support