Cleaned up MouseListener