3.4.3 Minor code cleaning