Various tiny modif in organization