Formatted all of the source code that was not accordance with the coding style. This was caused by merges from 2.2 into 2.3.