code cleanup (spd)