Polish expert (4)

I believe the answer is:
buff
I believe this clue is a double definition.
'polish' is the first definition.
(buffing is a kind of polishing)
'expert?' is the second definition.
(thesaurus)
(Other definitions for buff that I've seen before include "fan of > nudism?" , "light shade" , "Polish - fan" , "with attractively well-developed muscles" , "Informal enthusiast - polish him" .)