Remove 1 level of block nesting by using elseif