Refactor passing environment

Prior to this commit we were not consistant how
we passed values in given our simple loops
+ whitespace