Build against 1.8
Reformat code
Redo a few commands