Clean up style and formatting