re-arrange environment.rb