more template cleanup/consistency