Comments and code cleaning
Next code cleaning