Minor work on MouseListener