Java 8 Conversion and code style changes