small refacto, since we're going to use these on alter & all