removed most of the "x === true / false" and some other formatting