Small tidy and remove -march=core2 (my old CPU)