Fixed Indentation.
Re-factor template render
Cleanup  Trailing whitespace.
Added location test.