fix clean exit/improve naming