Massive Code clean to improve ''comprehensibility''