MULE-6943 fix indentations and if order