Code cleanup #3.