Code Cleanup

used the Astyle program