Fix technical debt by Giuseppe Cosenza