Refactor conditions
Fix some wording