Code style: Clean up and format