A bit of code cleaning