Fixing format stuff