Cleanup message and support #<type>: comments