Added migrations and fixed formating