Could not do testing today, so I did code cleaning again