Fixing issue #176, also ran over the entire source tree with the auto formatter.