removed if else