cosmetic: move r = ... into new lines (also the old)