Improve Initial Working Environment code for peer review