Poro messages

Here are some awesome refactorings. Merge them or not. Your call.