Versions updated
Code cleaned