Add a comment handler
Simplify logger & cleanup code