Tidy the parts of Environments that Jenny has completed