Some renaming + refactoring towards Java 8
Renaming + comments