removed some redundant conditionals