When you take your bike in, it's important to tell the shop what's on your mind regarding the noises, because a tune-up is a set of mechanical adjustment procedures, not a seek-and-destroy mission against clicking/popping/creaking. Also, if they gave you 20% off, it's likely they lost money selling you a bike once overhead is factored in, so just appreciate that.