more refactoring, mouse