Format and tweaks#3

sys9kdr wants to merge 4 commits intomainsys9kdr/envpaths:mainfrom

format-and-tweakssys9kdr/envpaths:format-and-tweaksCopy head branch name to clipboard