Some rearrangement for log closing. :japanese_goblin: