gustafn
committed
on 29 Jul 19
reduce verbosity and modernize code