removed hanging if statement