these are not "functional" refactors so I think we are solid