added logger, cleanup