Removed returns between helper functions