Cleanup
Template refactor++