Cleanups
Added extra formats