clean up if statement