Refactor, minor highlight changes