Remove body migration, fix line lengths