Code cleanup #2