Seconded yzer's comments. A good cleaning inside and out will not be a bad thing. I would hazard a guess that this is the main issue.
Saying that, you might want to consider getting a new battery. The ICR battery you are using is probably OK as it's in a protected APV, but I would use them in my flashlight and get me a good quality IMR battery to use for vaping.