Better naming of helper class