That's pretty much all there is too it. Remove the trigger from the frame, and realize it's a tapered pin that comes out and goes back in only one direction. That's the only real trick. The small end if the right side. As for the pin in the trigger that holds the mag disconnect, just be careful that you don't slip with your punch. Good luck. Oh, a little word of advice for getting the trigger pin in the frame out. It's tight. Start it with a plastic mallet or short fiberglass punch so as to avoid marring the finish.
By the way, it's technically not a safety, and the advice I would tell people is don't worry about it. If you ever really do get into a shooting, realize a lawsuit is comeing regardless of how stock your gun is and how justified you are, especially if you have any resources that the bad guy or his family can attack. If it happens on your property, consider that the bad guy or his family will be looking at you AND your homeowners insurance, if applicable. Think more in terms of finding a good attorney.