Improved Code Formatting