Code cleanup #5