Updated formatting and comments to fix Travis CI errors; Changed operators to remove | character for xorish operators