Intrinsic motivation is founded on autonomy, mastery, and purpose.
Extrinsic motivation may lead to hedonistic adaptation (but it all depends on the person and the person's circumstance).
I appreciate the idea of "improvement is the goal in and of itself".