diff --git a/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/index/node/AbstractIndexNode.xtend b/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/index/node/AbstractIndexNode.xtend
index 45a0a96..05b7957 100644
--- a/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/index/node/AbstractIndexNode.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/index/node/AbstractIndexNode.xtend
@@ -11,10 +11,7 @@
 	}
 	
 	override getDisplayName() {
-		if (displayName != null)
-			displayName
-		else
-			path.substring(path.lastIndexOf('/') + 1)
+		displayName ?: path.substring(path.lastIndexOf('/') + 1)
 	}
 	
 }
\ No newline at end of file
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/TextCellPainter.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/TextCellPainter.xtend
index e52428f..56267d7 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/TextCellPainter.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/TextCellPainter.xtend
@@ -8,11 +8,7 @@
 class TextCellPainter implements CellPainter {
 	
 	override paintCell(Cell cell, PixelArea cellPaintArea, GraphicsContext gc) {
-		val text =
-			if (cell.dataValue != null)
-				cell.dataValue.toString
-			else
-				""
+		val text = cell.dataValue?.toString ?: ""
 		
 		val centerX = cellPaintArea.width.doubleValue / 2
 		val centerY = cellPaintArea.height.doubleValue / 2