remove strange regex, add single quotes highlighting, add comments