Fixing format stuff
Fixing formats