Combined if statements

Also removed the commented out block of text.