Refactoring & mise en place pipeline minification