continue to make modif to the fit the codestyle