refactor in partials + text