Simple code cleaning