get rid of unneeded isset checks