Added logger, cosmetics