Privatize non public methods
Remove superfluous logging