Code Formatting and Various Other Changes.