clean up

Replace binary or operators with logical or.
Reduce line lengths
minor other stuff.