Tidy migrations

Resolves #34