Just a bit of code cleaning