cleanup + changes