changed public methods to private, renamed other methods
Merge branch 'removingmorepublicmethods'