Code a little bit cleaned now