some more cleaning notices about undefined vars