refactor: cleanup message handler conditions