Code Formatting & Cleanup