Starting on message parsing cleanup