Refactor

Remove unneeded template param