Refactor that ugly code (part 2) | CINQ ICT