Clean up code formatting