Refactored highlight and code boxes to be easier to maintain