Tidying up client/keys.go