Cleanup code
Add safer script settings