Made dying easier
Some cleanup
Use a formatting table to ease maintenance burden