Correct all style and format issues