Petit arrangement de look
Code cleaning, API simplification, lot of refactor still waiting...