Removed extraneous if statement