Removed constants and fallback behaviour from highlight function