Fix some troubles with indentations and etc.
Improve migrations