Refactored swing painters