Improve environment