remove some whitespace
add hack for or statement defaults