Minor code cleaning