Code cleanup + migration from Log4J to Logback