Feature: improve settings and environment logic and phase out redundant environment keys

Feature: improve settings and environment logic and phase out redundant environment keys #80