small bool logic refactor