Moved to java 1.8. Code cleanup and formatting.