tweak usage of helper class