Retire double if imbriques + else

Signed-off-by: Danny Serres <danny.serres@polymtl.ca>