indentation fixes, migrate changes