cleanup + fix