gustafn
committed
on 06 Jun 20
cleanup (generalize and simplify code)