Modif init, clean code