Refactor that ugly code (part 1) | CINQ ICT