Refactored unnecessary helper class