Some code cleaning for Bernard