- Converted to Java 1.8 formatting