Loads of Code cleanup and formatting
Code Cleanup
Code Cleanup