removed redundant elseif