cleanup - migration to java 8
reformat code
move difficulty to enum