Remove identity function and use Boolean as a shortcut