Code cleanup & better use of Java 8