general code cleaning, scout upgraded