Simplified patch with border using groupByKey
Added line continuation in patch with border