Made helpers more DRY