#32 refact for log module