WIP: cleanup logger and comments