acu170189 - move duplicated logic into helper module