fix & order & indenting logic in comments template