refactor metro_data rake