nit: I think it's better to have this separated.