Make a refactor of some similar 'partials' files