Tweak abort algorithm inputs
Rename variables