I, too, use WD 40 or similar product for storage; corrosion prevention is my primary concern. I have a dehumidifier in my basement, where my storage is, but I can never be too careful.
Then, when the weapons come out to play, they gets a quick shot of actual gun oil for the sake of lubricity.
I've had good success with this over the years.
_________________________
dnewton3
Glock and Armalite certified armorer