Both. Clean the ground good and if your terminals on the battery look pretty corrosive, clean it with a brush.
However, the car that has this problem really solved the problem when we changed to those heavy duty dry cell batteries with 750 cold cranking amps. No more click clik click...start right up.
Some time it's not the starter, but voltage drop to the starter.
Tx.
Wayne
<a href="http://www.phase2motortrend.com
" target="_blank">http://www.phase2motortrend.com
</a>