Spacing cleanup
Organize painters by type, separate fills from draws