Cleanup in message.py
PEP8