Clarified some conditionals