[#63182680] Correct indentation
[#63182680] remove the foreach loops, since they were always bound to a
single value