Some clean up, some reformatting for better readability and some additions like environment variables that are new considered:
