removed another level of if/then hierarchy by returning false if initial match is successful