cleaned if else