Clean up scripts better