The code was restructured according to the indications of Daniel