Finished Message logic refactor