more refactoring removing of public methods; moving methods together as public, private
refactoring out unused methods and public method, moving together