fix condition, cleanup for easier review