Refactoring class

Changed an if statement to a conditional-or statement and got rid of some comments.