code cleaning III