fix variable names, public->private