Code cleanup #5.