refactoring; extended MouseHandler for future needs;