style: renamed and made 'private' some methods