Refactoring

Related to  https://github.com/jsilvestre/cozy-template/pull/new/refactoring