Tested
A little code cleaning