Merged migration files, indentation fixes