fixed indentation and reset elif/elseif fix that will be merged from 2.4