Little code cleaning