Fixed indent
Update to Java 8