issue 203 addendum: dry + function style fix