tidied the module pattern used in highlight