Refacto/uniformisation & correction

@bewiwi no, exactly like i said: just a simple `if` should work.