move some things to private