WFK2-348 Update format to match Spring example.

I figured it would be easier if I just made the fixes I found instead of reporting them to you. Hope you don't mind.