Refactored highlight functionality into its own module