Updates on feedback from @wedaly

Comments from @wedaly
Tidy ups, remove redundant comments, tidy up env constants