refactor, highlighter fix + dot