cleanup for readability of migrations, mostly done