general cleanup of the helper class. Refactor