Make resulting highlight code tidier