PLA-1628 Refactor Special Promote

not my code but I'll reformat it anyway. ACK