Code cleaning (adapt to previous changes)