Get rid of unnecessary boolean