Cleanup of formatting and comment messages