Took more out of if statement