Code cleaned
last fixes