Small template cleanup