Code Formatting Improvements