Some improvements in the code cleanness