cleaned up scripts a bit