removed doubled || call, removed redurant code.