Code cleanup #2.