make add remove highlight codes more readable