remove uneeded semicolon
fix -Wshadow warnings