move the variable declaration at start of upper for block and
remove the redundant brace.
Signed-off-by: Jun Zhao <mypopydev@gmail.com>