gustafn
committed
on 29 Jul
reduce verbosity and modernize code