Migrated to Java 8 as well fixed some enconding issues
Reformatted code