Cleanup
Moving things into environment variables and cleanup