cleaned up boolean function

now with more bool!