styling tweaks and consolidating templating methods

Signed-off-by: Timothy Wood <tim@imaginesimplicity.com>