Code Styling Fixes