Removed duplicate parameter
- use call-by-reference rather than call by value for passing values to included subtemplates (should be done probably on many more places)