Code Formatting and Module Cleanup