cleanup + argument fix