Fix minor coding style issues in message splitting