Better logging and boring cleanup