Subject Line: if conditional refactor
What Happened: refactoring if conditional using && operator
removing extra if