some cleaning up, java 8 migration