Removed highlighting for now. Simplifying and cleaning a bit.