Refine convenience scripts