Fix the pbxproj and reformat the code