Cleanup, added SLF4J logging.