Adding logging, java code conventions