Cleanup and formatting.
Code Cleanup and Formatting of all src and test.