Update Highlight editor to homogenize with other documents.
Code cleanup.
Merge pull request #2 from intportg/master

Update Highlight editor to homogenize with other documents.