cleanup booleans and null representations