diff --git a/Kapitel 4/4.2.10/controls-choicebox/src/main/java/de/javafxbuch/MainApp.java b/Kapitel 4/4.2.10/controls-choicebox/src/main/java/de/javafxbuch/MainApp.java
index 03c9d23..e3e0cb0 100644
--- a/Kapitel 4/4.2.10/controls-choicebox/src/main/java/de/javafxbuch/MainApp.java	
+++ b/Kapitel 4/4.2.10/controls-choicebox/src/main/java/de/javafxbuch/MainApp.java	
@@ -14,7 +14,7 @@ public static void main(String[] args) throws Exception {
 
     @Override
     public void start(Stage primaryStage) {
-        ChoiceBox cb = new ChoiceBox();
+        ChoiceBox<String> cb = new ChoiceBox<>();
         for (int i = 0; i < 20; i++) {
             cb.getItems().add("Option " + i);
         }
diff --git a/Kapitel 4/4.2.8/controls-tableview/src/main/java/de/javafxbuch/MainApp.java b/Kapitel 4/4.2.8/controls-tableview/src/main/java/de/javafxbuch/MainApp.java
index 3f2bb23..1e866c6 100644
--- a/Kapitel 4/4.2.8/controls-tableview/src/main/java/de/javafxbuch/MainApp.java	
+++ b/Kapitel 4/4.2.8/controls-tableview/src/main/java/de/javafxbuch/MainApp.java	
@@ -24,10 +24,11 @@ public static void main(String[] args) throws Exception {
         launch(args);
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     public void start(Stage primaryStage) {
-        TableView tableView = new TableView();
-        ObservableList< Player> players = FXCollections
+        TableView<Player> tableView = new TableView<>();
+        ObservableList<Player> players = FXCollections
                 .observableArrayList(
                         new Player("Manuel", "Neuer", 0),
                         new Player("Philipp", "Lahm", 0),
@@ -36,21 +37,22 @@ public void start(Stage primaryStage) {
                         new Player("Benedikt", "Höwedes", 0)
                 );
         tableView.setItems(players);
-        TableColumn firstName = new TableColumn("Vorname");
-        TableColumn lastName = new TableColumn("Nachname");
-        TableColumn goals = new TableColumn("Tore");
+        TableColumn<Player, String> firstName = new TableColumn<>("Vorname");
+        TableColumn<Player, String> lastName = new TableColumn<>("Nachname");
+        TableColumn<Player, Integer> goals = new TableColumn<>("Tore");
         tableView.getColumns().addAll(firstName, lastName, goals);
         firstName.setCellValueFactory(
                 new PropertyValueFactory<Player, String>("firstName")
         );
         lastName.setCellValueFactory(
-                new PropertyValueFactory<Player, String>("lastName"));
+                new PropertyValueFactory<Player, String>("lastName")
+        );
         goals.setCellValueFactory(
-                new PropertyValueFactory< Player, Integer>("goals")
+                new PropertyValueFactory<Player, Integer>("goals")
         );
-        goals.setCellFactory(new Callback<TableColumn< Player, Integer>, TableCell<Player, Integer>>() {
+        goals.setCellFactory(new Callback<TableColumn<Player, Integer>, TableCell<Player, Integer>>() {
             @Override
-            public TableCell< Player, Integer> call(TableColumn< Player, Integer> param) {
+            public TableCell<Player, Integer> call(TableColumn<Player, Integer> param) {
                 return new GoalsCell();
             }
         });
@@ -60,7 +62,7 @@ public TableCell< Player, Integer> call(TableColumn< Player, Integer> param) {
         firstName.setOnEditCommit(new EventHandler<CellEditEvent<Player, String>>() {
             @Override
             public void handle(CellEditEvent<Player, String> t) {
-                ((Player) t.getTableView().getItems().get(t.getTablePosition().getRow())).setFirstName(t.getNewValue());
+                t.getTableView().getItems().get(t.getTablePosition().getRow()).setFirstName(t.getNewValue());
             }
         });
         StackPane root = new StackPane(tableView);