reduce usage of "environment" god object