Why are you changing all of this formatting? It has nothing to do with the bugs that you're trying to fix, and the module is fairly consistent the way that it is. All of these format changes are clogging the diff without adding any value.