specific layout unecessary + simplfying conditional (thanks Roberto for
the hint)