highlight refactoring