Removed redundant elseif block