Working on template cleanup