Progress on code cleaning.
Finish up.