Fixed typos and abstracted the environments directory