Clean up Formats implementation