remove dead code
go fmt
add scope consts