I have to laugh at myself here... At first, I thought you were talking about enforcing that environment targets need to be defined in a separate/special BUILD file. It's truly just code organization. Your refactor looks like an improvement to me. 🙂