simplify and remove unnecessary checking