When possible, avoid statement-scope variable for a better maintanability
of the code.
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>