Correct var names, and shorter template path