remove BOOLEAN constant, have helper function
cleanup
cleanup
cleanup
cleanup
cleanup
cleanup
more boolean cleanup