Some code formatting.
Minor cleanup.
source now accepts an array of templates