-- cleaned up template and did Code-indentation
-- GEP-50, more changes to templates