Reorder Java8-JavaFX to be consistent