Address easy golint comments