Fix all style and format issues