Fix technical debt by Giuseppe CosenzaFix technical debt by Giuseppe Cosenza