Clean up formats and tile merging a bit