refactor per-env attrs

into more intuitive manner