ENH: cleanup + add updated script