* using lambda if possible (we are already building in Java8) * using diamond when new generic instance * remove used improt