Reformat
Getting build working