removed some log statements and removed public from some classes