Code Formatting Fixes