Simpler and equivalent control flow

Signed-off-by: Balthazar Rouberol <balthazar.rouberol@mapado.com>