Script tweak, add cleanup