Reduce local variable scope

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Drop unneeded statement

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>