code cleanup and new Catalyze iOS SDK