fix(flag-message): small refactor