Code cleanup especially around the logger (comment out unused methods, javadoc, formatting)