Running all methods with template
Small cleanup