nit: move this up