refactor dances.amd lightly