Clean up PR to match existing code style