Moved message parsing to own method
Extracted message conversion to own class