Updating message formatting to be more functional