Code cleanup 3.