More SB, code cleaning