Renamed format to asset type, cleanup formats