Cleanups to comments, archive and post templates