superficial refactors