simplified a routine conditions (and also added a small comment in an other file)