finished refactorings on mouse and interaction handler