removed redundant conditionals. corrected some strings