clean up api templates a bit