Cleaning up + adding in Migration information