Little bit of code cleaning