Moved ElseIf/Else in line with brackets