Cleanup format attempt 2

Sorry still a newb at GIT,  but learning.