Environment refactoring
Merge pull request #3 from GoldRenard/refactoring

Environment refactoring