Fixes numbering issue and adds back formatting