Simplified message parsing a bit