Consolidate some methods into helpers