Add conditions and shortcuts

See commits message to know what are my changes.

What is your coding style ?
I think, i didn't respect it.