a bit of code cleaning