Cleanup script a bit