Code cleaning ;-)