Streamline env detection