Update pkg-message

Clean up pkg-message some more.