Fixed highlighter and removed hard coding

Also modified a heading to not show for reviewers.