Restructuration of the code
FAIL Repetition...