Work on refactoring emphasizers