* refactor: make cleanup

* refactor: feedbacks

Co-authored-by: Adrien Kantcheff <adrien.kantcheff@bonitasoft.com>