Simpler but better commented abort logic