A little bit of code cleaning