Fixing numbering issue and indentation