A little of code cleaning