Remove redundant if statement

Instead of two if statements you can use an or statement. I saw another spot where I could add a closure so I did so; condensed a for statement as well.