readability refactoring: reduce test number, reduce variables, avoir unecessary else
readability refactoring: reduce test number, reduce variables, avoir unecessary else

uclouvain/osis,uclouvain/osis_louvain,uclouvain/osis,uclouvain/osis,uclouvain/OSIS-Louvain,uclouvain/OSIS-Louvain,uclouvain/osis,uclouvain/OSIS-Louvain,uclouvain/osis_louvain,uclouvain/osis_louvain