Refactor: move some methods from public to private