Style migration and cleanup