Template fiddling + Pod Update to fix 10.10 SDK issue

The template fiddling doesn't affect the output; just trying to make it easier to read the code and to reduce duplication.

@designatednerd good?