Readability Fix big || statements

Did so with a new static function/class