Really fix Intuition and format

Change-Id: I61c7e557ddc2945c1adb70c3fd67c6b0bb61e943