refactored paint controls, less redundancy