Removing unnessecary arrays from finder calls in template engine files
Refactoring templates, removing static make calls as you can initalize a new template anyway