[Java8] Explored more language features & refactor