Replace more || with or