Fix 'when' spacing, making diff smaller