ok, it is more readable indeed.

Done in 9d548bbb1cff5f55b5c60b7c5c145cf05e941386