cleaned up unnecessary condition