code cleaning again