Code cleanup per jhyde