Some code cleaning ...