Collapsed helper class into main class