Java version changed to 8
Class renamed
Lambdas used to save code