slight cleanup of attack code