Cleaning up environment a bit