Menzerna 400 is a great polish for removing swirl marks as well as light scuff and scratches. Other good polishes include Scholl Concepts S20 and Koch Chemie H9.