fixed highlighting
refactoring