Cleaned up and made easier to deploy.