Clean up environment.el
Bring the code to set environment to its appropriate place