Rifle/Pistol/Shotgun Training in Montco/Phila?

I am looking to take some training courses for mostly rifle and pistol. I live in West Chester, work in Philadelphia.

I am already proficient in use and safety, would just like some skill building courses, have any bad or 'could be improved upon' habits pointed out, and go from there.

Anyone have any recommendations or experience?

Thank you,

p3

For rifle, you can't go wrong with an Appleseed shoot.