Use more compact if format per comment from @skottler