Added highlighting priority, resolved some style check issues