Minor code cleaning update