Monkey patch and clean-up
Spacing