Cleanup: DRY