Fix some single | instead of ||
reformatted, dead code elimination
reformatting
reformatting
fixed up comments