Alpha 6: Cleaner logging