Pushing Konstantine's if statement modification for environment classification