Script cleanup

notes & refinement