fixed formatter and numbering issue