Code cleanup #4.