Code cleanup 2.