refactor issue related templates