Minor DRY refactor