add logger + cleanup